Initialize height from fixed_height before we do anything, so it always

Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>

        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
        from fixed_height before we do anything, so it always has a valid
        value.

        * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
        to gtk_tree_model_get (missing "," in param list).

diff --git a/ChangeLog b/ChangeLog
index df09cf601c21b73819112fd322c6526160ada4dc..228766fef98a5668ecdcc8d4076fcde61ed55cfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
+
+        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+        from fixed_height before we do anything, so it always has a valid
+        value.
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
+       to gtk_tree_model_get (missing "," in param list).
+
 2004-08-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from 2.4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index df09cf601c21b73819112fd322c6526160ada4dc..228766fef98a5668ecdcc8d4076fcde61ed55cfa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
+
+        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+        from fixed_height before we do anything, so it always has a valid
+        value.
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
+       to gtk_tree_model_get (missing "," in param list).
+
 2004-08-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from 2.4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index df09cf601c21b73819112fd322c6526160ada4dc..228766fef98a5668ecdcc8d4076fcde61ed55cfa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
+
+        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+        from fixed_height before we do anything, so it always has a valid
+        value.
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
+       to gtk_tree_model_get (missing "," in param list).
+
 2004-08-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from 2.4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index df09cf601c21b73819112fd322c6526160ada4dc..228766fef98a5668ecdcc8d4076fcde61ed55cfa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
+
+        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+        from fixed_height before we do anything, so it always has a valid
+        value.
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
+       to gtk_tree_model_get (missing "," in param list).
+
 2004-08-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from 2.4:

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 16b4f712e135069cd78c8529cc78e5d381036356..a3eb5b5a9bfbf771d63e4105435878d8b88da6a3 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -942,7 +942,7 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)
 
     gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
                        SHORTCUTS_COL_DATA, &data,
-                       SHORTCUTS_COL_IS_VOLUME &is_volume,
+                       SHORTCUTS_COL_IS_VOLUME, &is_volume,
                        SHORTCUTS_COL_PIXBUF_VISIBLE, &pixbuf_visible,
                        -1);
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4cf727541a31231de9bbc1398f3822d86ab89df7..9deac4dea7d73c8db9e7a9f0c532864ad77201e5 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -7080,6 +7080,12 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
 
   g_return_if_fail (path != NULL || iter != NULL);
 
+  if (tree_view->priv->fixed_height_mode
+      && tree_view->priv->fixed_height >= 0)
+    height = tree_view->priv->fixed_height;
+  else
+    height = 0;
+
   if (path == NULL)
     {
       path = gtk_tree_model_get_path (model, iter);
@@ -7137,12 +7143,6 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
   if (tree == NULL)
     goto done;
 
-  if (tree_view->priv->fixed_height_mode
-      && tree_view->priv->fixed_height >= 0)
-    height = tree_view->priv->fixed_height;
-  else
-    height = 0;
-
   /* ref the node */
   gtk_tree_model_ref_node (tree_view->priv->model, iter);
   if (indices[depth - 1] == 0)